network: allow disconnecting while activation is in progress

While connecting, the item should read "Turn Off", not "Connect".
To do so, change the meaning of isActive() to be really "not isOff()"

https://bugzilla.gnome.org/show_bug.cgi?id=706262

diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index 169400cad4c6d2e03a2077b87173909224744018..79cb711554c18eba2b9f7aaff8f52000259c2db9 100644 (file)
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -104,7 +104,7 @@ const NMConnectionItem = new Lang.Class({
         if (this._activeConnection == null)
             return false;
 
-        return this._activeConnection.state == NetworkManager.ActiveConnectionState.ACTIVATED;
+        return this._activeConnection.state <= NetworkManager.ActiveConnectionState.ACTIVATED;
     },
 
     _sync: function() {
@@ -1083,7 +1083,7 @@ const NMVPNConnectionItem = new Lang.Class({
         if (this._activeConnection == null)
             return false;
 
-        return this._activeConnection.vpn_state == NetworkManager.VPNConnectionState.ACTIVATED;
+        return this._activeConnection.vpn_state != NetworkManager.VPNConnectionState.DISCONNECTED;
     },
 
     _getStatus: function() {